Removed 'arg' suffix.
Fixed small compile errors related to suffix removal.