updating the states naming conventions and adjusting