Small updates to naming plus @ozzmotic's changes