fixed some nameing issues causing conflicts with namespace arma