renamed files to be more consistent with other class files