Rename to following previous naming convention