Improvements in naming