diff --git a/src/java/com/threerings/crowd/client/PlaceViewUtil.java b/src/java/com/threerings/crowd/client/PlaceViewUtil.java
index 8c8696c12..2bf3d5c8a 100644
--- a/src/java/com/threerings/crowd/client/PlaceViewUtil.java
+++ b/src/java/com/threerings/crowd/client/PlaceViewUtil.java
@@ -61,8 +61,8 @@ public class PlaceViewUtil
         if (root instanceof Container) {
             Container cont = (Container)root;
             int ccount = cont.getComponentCount();
-            for (int i = 0; i < ccount; i++) {
-                dispatchWillEnterPlace(cont.getComponent(i), plobj);
+            for (int ii = 0; ii < ccount; ii++) {
+                dispatchWillEnterPlace(cont.getComponent(ii), plobj);
             }
         }
     }
@@ -93,8 +93,8 @@ public class PlaceViewUtil
         if (root instanceof Container) {
             Container cont = (Container)root;
             int ccount = cont.getComponentCount();
-            for (int i = 0; i < ccount; i++) {
-                dispatchDidLeavePlace(cont.getComponent(i), plobj);
+            for (int ii = 0; ii < ccount; ii++) {
+                dispatchDidLeavePlace(cont.getComponent(ii), plobj);
             }
         }
     }
diff --git a/src/java/com/threerings/presents/client/ClientDObjectMgr.java b/src/java/com/threerings/presents/client/ClientDObjectMgr.java
index 4f8fbc388..7d0d65715 100644
--- a/src/java/com/threerings/presents/client/ClientDObjectMgr.java
+++ b/src/java/com/threerings/presents/client/ClientDObjectMgr.java
@@ -346,8 +346,8 @@ public class ClientDObjectMgr
             return;
         }
 
-        for (int i = 0; i < req.targets.size(); i++) {
-            @SuppressWarnings("unchecked") Subscriber<T> target = (Subscriber<T>)req.targets.get(i);
+        for (int ii = 0; ii < req.targets.size(); ii++) {
+            @SuppressWarnings("unchecked") Subscriber<T> target = (Subscriber<T>)req.targets.get(ii);
             // add them as a subscriber
             obj.addSubscriber(target);
             // and let them know that the object is in
@@ -368,8 +368,8 @@ public class ClientDObjectMgr
             return;
         }
 
-        for (int i = 0; i < req.targets.size(); i++) {
-            req.targets.get(i).requestFailed(oid, new ObjectAccessException(message));
+        for (int ii = 0; ii < req.targets.size(); ii++) {
+            req.targets.get(ii).requestFailed(oid, new ObjectAccessException(message));
         }
     }
 
diff --git a/src/java/com/threerings/presents/dobj/CompoundEvent.java b/src/java/com/threerings/presents/dobj/CompoundEvent.java
index e7be8c118..85ead2fac 100644
--- a/src/java/com/threerings/presents/dobj/CompoundEvent.java
+++ b/src/java/com/threerings/presents/dobj/CompoundEvent.java
@@ -129,8 +129,8 @@ public class CompoundEvent extends DEvent
 
         // we need to propagate our source oid to our constituent events
         int ecount = _events.size();
-        for (int i = 0; i < ecount; i++) {
-            _events.get(i).setSourceOid(sourceOid);
+        for (int ii = 0; ii < ecount; ii++) {
+            _events.get(ii).setSourceOid(sourceOid);
         }
     }
 
@@ -141,8 +141,8 @@ public class CompoundEvent extends DEvent
 
         // we need to propagate our target oid to our constituent events
         int ecount = _events.size();
-        for (int i = 0; i < ecount; i++) {
-            _events.get(i).setTargetOid(targetOid);
+        for (int ii = 0; ii < ecount; ii++) {
+            _events.get(ii).setTargetOid(targetOid);
         }
     }
 
@@ -179,8 +179,8 @@ public class CompoundEvent extends DEvent
     {
         buf.append("COMPOUND:");
         super.toString(buf);
-        for (int i = 0; i < _events.size(); i++) {
-            buf.append(", ").append(_events.get(i));
+        for (int ii = 0; ii < _events.size(); ii++) {
+            buf.append(", ").append(_events.get(ii));
         }
     }
 
diff --git a/src/java/com/threerings/presents/dobj/OidList.java b/src/java/com/threerings/presents/dobj/OidList.java
index b34e095ee..36716e520 100644
--- a/src/java/com/threerings/presents/dobj/OidList.java
+++ b/src/java/com/threerings/presents/dobj/OidList.java
@@ -74,8 +74,8 @@ public class OidList implements Streamable
     public boolean add (int oid)
     {
         // check for existence
-        for (int i = 0; i < _size; i++) {
-            if (_oids[i] == oid) {
+        for (int ii = 0; ii < _size; ii++) {
+            if (_oids[ii] == oid) {
                 return false;
             }
         }
@@ -99,10 +99,10 @@ public class OidList implements Streamable
     public boolean remove (int oid)
     {
         // scan for the oid in question
-        for (int i = 0; i < _size; i++) {
-            if (_oids[i] == oid) {
+        for (int ii = 0; ii < _size; ii++) {
+            if (_oids[ii] == oid) {
                 // shift the rest of the list back one
-                System.arraycopy(_oids, i+1, _oids, i, --_size-i);
+                System.arraycopy(_oids, ii+1, _oids, ii, --_size-ii);
                 return true;
             }
         }
@@ -115,8 +115,8 @@ public class OidList implements Streamable
      */
     public boolean contains (int oid)
     {
-        for (int i = 0; i < _size; i++) {
-            if (_oids[i] == oid) {
+        for (int ii = 0; ii < _size; ii++) {
+            if (_oids[ii] == oid) {
                 return true;
             }
         }
@@ -138,11 +138,11 @@ public class OidList implements Streamable
     {
         StringBuilder buf = new StringBuilder();
         buf.append("{");
-        for (int i = 0; i < _size; i++) {
-            if (i > 0) {
+        for (int ii = 0; ii < _size; ii++) {
+            if (ii > 0) {
                 buf.append(", ");
             }
-            buf.append(_oids[i]);
+            buf.append(_oids[ii]);
         }
         buf.append("}");
         return buf.toString();
diff --git a/src/java/com/threerings/presents/server/PresentsDObjectMgr.java b/src/java/com/threerings/presents/server/PresentsDObjectMgr.java
index f86322f4e..06680c911 100644
--- a/src/java/com/threerings/presents/server/PresentsDObjectMgr.java
+++ b/src/java/com/threerings/presents/server/PresentsDObjectMgr.java
@@ -493,8 +493,8 @@ public class PresentsDObjectMgr
 
             try {
                 OidList list = (OidList)field.get(target);
-                for (int i = 0; i < list.size(); i++) {
-                    clearReference(target, field.getName(), list.get(i));
+                for (int ii = 0; ii < list.size(); ii++) {
+                    clearReference(target, field.getName(), list.get(ii));
                 }
 
             } catch (Exception e) {
@@ -536,12 +536,12 @@ public class PresentsDObjectMgr
         // determine where to add the reference
         Reference ref = new Reference(target.getOid(), oae.getName(), oid);
         int rpos = -1;
-        for (int i = 0; i < refs.length; i++) {
-            if (ref.equals(refs[i])) {
+        for (int ii = 0; ii < refs.length; ii++) {
+            if (ref.equals(refs[ii])) {
                 log.warning("Ignoring request to track existing reference " + ref + ".");
                 return true;
-            } else if (refs[i] == null && rpos == -1) {
-                rpos = i;
+            } else if (refs[ii] == null && rpos == -1) {
+                rpos = ii;
             }
         }
 
@@ -588,11 +588,11 @@ public class PresentsDObjectMgr
         }
 
         // look for the matching reference
-        for (int i = 0; i < refs.length; i++) {
-            Reference ref = refs[i];
+        for (int ii = 0; ii < refs.length; ii++) {
+            Reference ref = refs[ii];
             if (ref != null && ref.equals(toid, field)) {
 //                log.info("Removed reference " + refs[i] + ".");
-                refs[i] = null;
+                refs[ii] = null;
                 return true;
             }
         }
@@ -818,10 +818,10 @@ public class PresentsDObjectMgr
         Reference ref = null;
 
         if (refs != null) {
-            for (int i = 0; i < refs.length; i++) {
-                if (refs[i].equals(reffer.getOid(), field)) {
-                    ref = refs[i];
-                    refs[i] = null;
+            for (int ii = 0; ii < refs.length; ii++) {
+                if (refs[ii].equals(reffer.getOid(), field)) {
+                    ref = refs[ii];
+                    refs[ii] = null;
                     break;
                 }
             }
diff --git a/src/java/com/threerings/presents/tools/ImportSet.java b/src/java/com/threerings/presents/tools/ImportSet.java
index 33147e243..b20855753 100644
--- a/src/java/com/threerings/presents/tools/ImportSet.java
+++ b/src/java/com/threerings/presents/tools/ImportSet.java
@@ -312,8 +312,8 @@ public class ImportSet
         }
         for (String name : toMunge) {
             String newname = name;
-            for (int i = 0; i < replace.length; i += 2) {
-                newname = newname.replace(replace[i], replace[i + 1]);
+            for (int ii = 0; ii < replace.length; ii += 2) {
+                newname = newname.replace(replace[ii], replace[ii + 1]);
             }
             _imports.add(newname);
         }
diff --git a/src/java/com/threerings/util/MessageBundle.java b/src/java/com/threerings/util/MessageBundle.java
index 28d97657c..3f783441f 100644
--- a/src/java/com/threerings/util/MessageBundle.java
+++ b/src/java/com/threerings/util/MessageBundle.java
@@ -380,13 +380,13 @@ public class MessageBundle
             String argstr = compoundKey.substring(tidx+1);
             String[] args = StringUtil.split(argstr, "|");
             // unescape and translate the arguments
-            for (int i = 0; i < args.length; i++) {
+            for (int ii = 0; ii < args.length; ii++) {
                 // if the argument is tainted, do no further translation
                 // (it might contain |s or other fun stuff)
-                if (MessageUtil.isTainted(args[i])) {
-                    args[i] = MessageUtil.unescape(MessageUtil.untaint(args[i]));
+                if (MessageUtil.isTainted(args[ii])) {
+                    args[ii] = MessageUtil.unescape(MessageUtil.untaint(args[ii]));
                 } else {
-                    args[i] = xlate(MessageUtil.unescape(args[i]));
+                    args[ii] = xlate(MessageUtil.unescape(args[ii]));
                 }
             }
             return get(key, (Object[]) args);
diff --git a/src/java/com/threerings/util/MethodProfiler.java b/src/java/com/threerings/util/MethodProfiler.java
index 634ac4d9b..4a3244186 100644
--- a/src/java/com/threerings/util/MethodProfiler.java
+++ b/src/java/com/threerings/util/MethodProfiler.java
@@ -227,7 +227,7 @@ public class MethodProfiler
         @Override public void run ()
         {
             try {
-                for (int i = 0; i < _methodCount; ++i) {
+                for (int ii = 0; ii < _methodCount; ++ii) {
                     MethodProfiler.this.enter(_method);
                     Thread.sleep(_sleep);
                     MethodProfiler.this.exit(_method);