re-wrote aliases in 'snake-case'