Final Fixes

Changed names around