Adjusting naming and formatting