Minor improvements in naming