Renames AssociateUsagePointController and code cleanup