renaming everyting to fit the spec