Updated to work with name changeswq