diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/MediaContract.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/MediaContract.java
index c179768ad9db5..f46a9a6aa60ac 100644
--- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/MediaContract.java
+++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/MediaContract.java
@@ -113,7 +113,7 @@ public interface MediaContract extends FilterableService<MediaContract> {
     /**
      * Create the access policy.
      * 
-     * @param name
+     * @param accessPolicyName
      *            name of access policy
      * @param durationInMinutes
      *            Duration in minutes that blob access will be granted when using this access policy
@@ -121,12 +121,12 @@ public interface MediaContract extends FilterableService<MediaContract> {
      * @throws ServiceException
      *             the service exception
      */
-    AccessPolicyInfo createAccessPolicy(String name, double durationInMinutes) throws ServiceException;
+    AccessPolicyInfo createAccessPolicy(String accessPolicyName, double durationInMinutes) throws ServiceException;
 
     /**
      * Create the access policy with the given options.
      * 
-     * @param name
+     * @param accessPolicyName
      *            name of access policy
      * @param durationInMinutes
      *            Duration in minutes that blob access will be granted when using this access policy
@@ -136,29 +136,29 @@ public interface MediaContract extends FilterableService<MediaContract> {
      * @throws ServiceException
      *             the service exception
      */
-    AccessPolicyInfo createAccessPolicy(String name, double durationInMinutes, CreateAccessPolicyOptions options)
-            throws ServiceException;
+    AccessPolicyInfo createAccessPolicy(String accessPolicyName, double durationInMinutes,
+            CreateAccessPolicyOptions options) throws ServiceException;
 
     /**
      * Delete the access policy with the given id.
      * 
-     * @param id
+     * @param accessPolicyId
      *            of access policy to delete
      * @throws ServiceException
      *             the service exception
      */
-    void deleteAccessPolicy(String id) throws ServiceException;
+    void deleteAccessPolicy(String accessPolicyId) throws ServiceException;
 
     /**
      * Get a single access policy.
      * 
-     * @param id
+     * @param accessPolicyId
      *            the id of the asset to retrieve
      * @return the asset
      * @throws ServiceException
      *             the service exception
      */
-    AccessPolicyInfo getAccessPolicy(String id) throws ServiceException;
+    AccessPolicyInfo getAccessPolicy(String accessPolicyId) throws ServiceException;
 
     /**
      * List access policies.
@@ -236,14 +236,14 @@ public LocatorInfo createLocator(String accessPolicyId, String assetId, LocatorT
     /**
      * Delete locator.
      * 
-     * @param id
+     * @param locatorId
      *            the id
      * @throws UniformInterfaceException
      *             the uniform interface exception
      * @throws ServiceException
      *             the service exception
      */
-    public void deleteLocator(String id) throws UniformInterfaceException, ServiceException;
+    public void deleteLocator(String locatorId) throws UniformInterfaceException, ServiceException;
 
     /**
      * List locators.
diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/implementation/MediaExceptionProcessor.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/implementation/MediaExceptionProcessor.java
index 3bb35d14e1179..d2416c332da2a 100644
--- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/implementation/MediaExceptionProcessor.java
+++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/implementation/MediaExceptionProcessor.java
@@ -212,9 +212,10 @@ public void updateAsset(String assetId, UpdateAssetOptions updateAssetOptions) t
      * @see com.microsoft.windowsazure.services.media.MediaContract#createAccessPolicy(double)
      */
     @Override
-    public AccessPolicyInfo createAccessPolicy(String name, double durationInMinutes) throws ServiceException {
+    public AccessPolicyInfo createAccessPolicy(String accessPolicyName, double durationInMinutes)
+            throws ServiceException {
         try {
-            return service.createAccessPolicy(name, durationInMinutes);
+            return service.createAccessPolicy(accessPolicyName, durationInMinutes);
         }
         catch (UniformInterfaceException e) {
             throw processCatch(new ServiceException(e));
@@ -228,10 +229,10 @@ public AccessPolicyInfo createAccessPolicy(String name, double durationInMinutes
      * @see com.microsoft.windowsazure.services.media.MediaContract#createAccessPolicy(double, com.microsoft.windowsazure.services.media.models.CreateAccessPolicyOptions)
      */
     @Override
-    public AccessPolicyInfo createAccessPolicy(String name, double durationInMinutes, CreateAccessPolicyOptions options)
-            throws ServiceException {
+    public AccessPolicyInfo createAccessPolicy(String accessPolicyName, double durationInMinutes,
+            CreateAccessPolicyOptions options) throws ServiceException {
         try {
-            return service.createAccessPolicy(name, durationInMinutes, options);
+            return service.createAccessPolicy(accessPolicyName, durationInMinutes, options);
         }
         catch (UniformInterfaceException e) {
             throw processCatch(new ServiceException(e));
@@ -261,9 +262,9 @@ public List<AccessPolicyInfo> listAccessPolicies() throws ServiceException {
      * @see com.microsoft.windowsazure.services.media.MediaContract#deleteAccessPolicy(java.lang.String)
      */
     @Override
-    public void deleteAccessPolicy(String id) throws ServiceException {
+    public void deleteAccessPolicy(String accessPolicyId) throws ServiceException {
         try {
-            service.deleteAccessPolicy(id);
+            service.deleteAccessPolicy(accessPolicyId);
         }
         catch (UniformInterfaceException e) {
             throw processCatch(new ServiceException(e));
@@ -277,9 +278,9 @@ public void deleteAccessPolicy(String id) throws ServiceException {
      * @see com.microsoft.windowsazure.services.media.MediaContract#getAccessPolicy(java.lang.String)
      */
     @Override
-    public AccessPolicyInfo getAccessPolicy(String id) throws ServiceException {
+    public AccessPolicyInfo getAccessPolicy(String accessPolicyId) throws ServiceException {
         try {
-            return service.getAccessPolicy(id);
+            return service.getAccessPolicy(accessPolicyId);
         }
         catch (UniformInterfaceException e) {
             throw processCatch(new ServiceException(e));
diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/implementation/MediaRestProxy.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/implementation/MediaRestProxy.java
index 629aa9de3aa44..3edcbb2c0301e 100644
--- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/implementation/MediaRestProxy.java
+++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/implementation/MediaRestProxy.java
@@ -291,22 +291,24 @@ public void deleteAsset(String assetId) throws ServiceException {
      * @see com.microsoft.windowsazure.services.media.MediaContract#createAccessPolicy(double)
      */
     @Override
-    public AccessPolicyInfo createAccessPolicy(String name, double durationInMinutes) throws ServiceException {
-        return createAccessPolicy(name, durationInMinutes, null);
+    public AccessPolicyInfo createAccessPolicy(String accessPolicyName, double durationInMinutes)
+            throws ServiceException {
+        return createAccessPolicy(accessPolicyName, durationInMinutes, null);
     }
 
     /* (non-Javadoc)
      * @see com.microsoft.windowsazure.services.media.MediaContract#createAccessPolicy(double, com.microsoft.windowsazure.services.media.models.CreateAccessPolicyOptions)
      */
     @Override
-    public AccessPolicyInfo createAccessPolicy(String name, double durationInMinutes, CreateAccessPolicyOptions options)
-            throws ServiceException {
+    public AccessPolicyInfo createAccessPolicy(String accessPolicyName, double durationInMinutes,
+            CreateAccessPolicyOptions options) throws ServiceException {
 
         if (options == null) {
             options = new CreateAccessPolicyOptions().addPermissions(EnumSet.of(AccessPolicyPermission.WRITE));
         }
 
-        AccessPolicyType requestData = new AccessPolicyType().setDurationInMinutes(durationInMinutes).setName(name)
+        AccessPolicyType requestData = new AccessPolicyType().setDurationInMinutes(durationInMinutes)
+                .setName(accessPolicyName)
                 .setPermissions(AccessPolicyPermission.bitsFromPermissions(options.getPermissions()));
 
         WebResource resource = getResource("AccessPolicies");
@@ -319,8 +321,8 @@ public AccessPolicyInfo createAccessPolicy(String name, double durationInMinutes
      * @see com.microsoft.windowsazure.services.media.MediaContract#getAccessPolicy(java.lang.String)
      */
     @Override
-    public AccessPolicyInfo getAccessPolicy(String id) throws ServiceException {
-        WebResource resource = getResource("AccessPolicies", id);
+    public AccessPolicyInfo getAccessPolicy(String accessPolicyId) throws ServiceException {
+        WebResource resource = getResource("AccessPolicies", accessPolicyId);
         return resource.type(MediaType.APPLICATION_ATOM_XML).accept(MediaType.APPLICATION_ATOM_XML)
                 .get(AccessPolicyInfo.class);
     }
@@ -329,8 +331,8 @@ public AccessPolicyInfo getAccessPolicy(String id) throws ServiceException {
      * @see com.microsoft.windowsazure.services.media.MediaContract#deleteAccessPolicy(java.lang.String)
      */
     @Override
-    public void deleteAccessPolicy(String id) throws ServiceException {
-        getResource("AccessPolicies", id).delete();
+    public void deleteAccessPolicy(String accessPolicyId) throws ServiceException {
+        getResource("AccessPolicies", accessPolicyId).delete();
     }
 
     /* (non-Javadoc)