Minor changes in name for future additions