Refactor names for consistency and betterness