Naming cleanup. Using new attribute routing