A bit more refactoring (mostly just names)