Name consistency (remove underscores).