renamed all things properly