Whoops, forgot to revert the device member names aswell
Added using namespace declarations in implementation files