Remove snake_case and package private enforcements