Improved some naming