Remove underscore from props names