Fixed naming issues in acc_units