[cosmetic] Move underscore to before identifier