comcontroller fix, renames