some aliases to make find & replace refactoring a little easier
added logging