Class name <-> File Name Agreement

Re-submitting on the dev branch.