Naming fixes for .using and .foreach