api names controllers rework and syntax cleanup