#480 Revert according to previous comments, without underscores