Revised puppet aliases, more clarity