rename a few things for further use
rename a few things for further use