Fixed some incorrect package names: a few packages were using
"ApacheMaven" as the class name, which is incorrect