0.0.44.6

Finished refractored naming