Minor tidy and rename