diff --git a/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/features/VirtualMachineAsyncClient.java b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/features/VirtualMachineAsyncClient.java
index 4b68ffebd3..a7e1a19b46 100644
--- a/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/features/VirtualMachineAsyncClient.java
+++ b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/features/VirtualMachineAsyncClient.java
@@ -74,11 +74,11 @@ public interface VirtualMachineAsyncClient {
    ListenableFuture<AssignedIpAddresses> getAssignedIpAddresses(@EndpointParam URI uri);
 
    /**
-    * @see VirtualMachineClient#getVirtualMachineConfigurationOptions
+    * @see VirtualMachineClient#getConfigurationOptions
     */
    @GET
    @Consumes("application/vnd.tmrk.cloud.virtualMachineConfigurationOptions")
    @JAXBResponseParser
    @ExceptionParser(ReturnNullOnNotFoundOr404.class)
-   ListenableFuture<VirtualMachineConfigurationOptions> getVirtualMachineConfigurationOptions(@EndpointParam URI uri);
+   ListenableFuture<VirtualMachineConfigurationOptions> getConfigurationOptions(@EndpointParam URI uri);
 }
diff --git a/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/features/VirtualMachineClient.java b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/features/VirtualMachineClient.java
index 8734ee572c..c72f9255ce 100644
--- a/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/features/VirtualMachineClient.java
+++ b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/features/VirtualMachineClient.java
@@ -69,6 +69,6 @@ public interface VirtualMachineClient {
     * @param uri the uri for the configuration options. e.g. /cloudapi/ecloud/virtualmachines/{id}/configurationoptions
     * @return the configuration options
     */
-   VirtualMachineConfigurationOptions getVirtualMachineConfigurationOptions(URI uri);
+   VirtualMachineConfigurationOptions getConfigurationOptions(URI uri);
 
 }
diff --git a/sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/features/VirtualMachineAsyncClientTest.java b/sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/features/VirtualMachineAsyncClientTest.java
index e496ca9023..fe9eda287c 100644
--- a/sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/features/VirtualMachineAsyncClientTest.java
+++ b/sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/features/VirtualMachineAsyncClientTest.java
@@ -82,7 +82,7 @@ public class VirtualMachineAsyncClientTest extends BaseTerremarkEnterpriseCloudA
    }
 
    public void testGetVirtualMachineConfigurationOptions() throws SecurityException, NoSuchMethodException, IOException, URISyntaxException {
-      Method method = VirtualMachineAsyncClient.class.getMethod("getVirtualMachineConfigurationOptions", URI.class);
+      Method method = VirtualMachineAsyncClient.class.getMethod("getConfigurationOptions", URI.class);
       HttpRequest httpRequest = processor.createRequest(method,new URI("/cloudapi/ecloud/virtualmachines/5504/configurationoptions"));
 
       assertRequestLineEquals(httpRequest, "GET https://services-beta.enterprisecloud.terremark.com/cloudapi/ecloud/virtualmachines/5504/configurationoptions HTTP/1.1");
diff --git a/sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/features/VirtualMachineClientLiveTest.java b/sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/features/VirtualMachineClientLiveTest.java
index 73152544ca..049f151e73 100644
--- a/sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/features/VirtualMachineClientLiveTest.java
+++ b/sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/features/VirtualMachineClientLiveTest.java
@@ -86,7 +86,7 @@ public class VirtualMachineClientLiveTest extends BaseTerremarkEnterpriseCloudCl
    }
 
    public void testGetVirtualMachineConfigurationOptions() throws Exception {
-      VirtualMachineConfigurationOptions virtualMachineConfigurationOptions = client.getVirtualMachineConfigurationOptions(new URI("/cloudapi/ecloud/virtualmachines/5504/configurationoptions"));
+      VirtualMachineConfigurationOptions virtualMachineConfigurationOptions = client.getConfigurationOptions(new URI("/cloudapi/ecloud/virtualmachines/5504/configurationoptions"));
       assertNotNull(virtualMachineConfigurationOptions);
    }
 }
diff --git a/sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/xml/VirtualMachineConfigurationOptionsJAXBParsingTest.java b/sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/xml/VirtualMachineConfigurationOptionsJAXBParsingTest.java
index 55b24697a0..3897d1c1f6 100644
--- a/sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/xml/VirtualMachineConfigurationOptionsJAXBParsingTest.java
+++ b/sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/xml/VirtualMachineConfigurationOptionsJAXBParsingTest.java
@@ -89,7 +89,7 @@ public class VirtualMachineConfigurationOptionsJAXBParsingTest extends BaseRestC
    @Test
    public void testParseVirtualMachineWithJAXB() throws Exception {
 
-      Method method = VirtualMachineAsyncClient.class.getMethod("getVirtualMachineConfigurationOptions", URI.class);
+      Method method = VirtualMachineAsyncClient.class.getMethod("getConfigurationOptions", URI.class);
       HttpRequest request = factory(VirtualMachineAsyncClient.class).createRequest(method,new URI("/1"));
       assertResponseParserClassEquals(method, request, ParseXMLWithJAXB.class);
 
@@ -97,13 +97,13 @@ public class VirtualMachineConfigurationOptionsJAXBParsingTest extends BaseRestC
             .createResponseParser(parserFactory, injector, method, request);
 
       InputStream is = getClass().getResourceAsStream("/virtualMachineConfigurationOptions.xml");
-      VirtualMachineConfigurationOptions virtualMachineConfigurationOptions = parser.apply(new HttpResponse(200, "ok", newInputStreamPayload(is)));
+      VirtualMachineConfigurationOptions configurationOptions = parser.apply(new HttpResponse(200, "ok", newInputStreamPayload(is)));
 
-      assertProcessorOptions(virtualMachineConfigurationOptions.getProcessor());
-      assertMemoryOptions(virtualMachineConfigurationOptions.getMemory());
-      assertDiskConfigurationOption(virtualMachineConfigurationOptions.getDisk());
-      assertNetworkAdapterOptions(virtualMachineConfigurationOptions.getNetworkAdapter());
-      assertCustomizationOption(virtualMachineConfigurationOptions.getCustomization());
+      assertProcessorOptions(configurationOptions.getProcessor());
+      assertMemoryOptions(configurationOptions.getMemory());
+      assertDiskConfigurationOption(configurationOptions.getDisk());
+      assertNetworkAdapterOptions(configurationOptions.getNetworkAdapter());
+      assertCustomizationOption(configurationOptions.getCustomization());
    }
 
    private void assertProcessorOptions(ConfigurationOptionRange processor) {