renamed class files to match types.