bz00000 - Refactoring for names