Stuff names is not consistent with requirements - rename