Eclipse shenanigans
Naming, fixing