Standardizing more names.
Purging scala classes