fix lint: no underscores in names