Refactor and rename some stuff