Just some type renames