rename a few things for further use