Housekeeping: variable names unified
kore will love us :>

 Done so much awesome and beautiful ant macro stuff :-]