Updates to remove underscores