Switch to name with underscore