atheme: refactor some names to make sense