Some changes concerning underscores
Updated to work better with underscores. the Update method was putting the space back in the name.