Removed dependency on M3.
Fix name collisions with keywords and other names.