Naming fix and removed unused alias.