Merged get_first_name and get_last_name from the Model_UserInfo class into one method that will accept 2 arguments. 1st argument is the user name, 2nd argument should be a constant defined in the class. Changed every reference to the old methods to the unified one.