Changing username to user_name shouldn't be included in this pull request. Its affecting too many places in code.