Refactor, mostly renames