Update altcalcs to master esp. class renames

Get altcalcs up-to-date with esp. class renames and also oozie, before proceeding on the optimizations, refactors, and/or alternate calculations.