Tiny changes in naming