Armadillo 1.2.2: Changed previous class names to correct ones