some naming unification in my UI components