Fix #93 - alias name conflicts

Using #define to create aliases leads to the potential of naming collisions. This commit introduces a new macro that just calls through to the aliased method