Fixing stuff broken by renaming (should test before committing to master)