Namechanges and some small additions to code