rhbz953734 - refactor names