maybe take advantage that you're in this file and rename firstname to first_name and lastname to last_name too?