Rename class; rework spec file to incorporate rename