Fixes for aminator #158 and #159

@bunjiboys updated the template a while back, fixes the namespace problem