TEPHRA-8 Cleanup class and package names