Updated to use more relevant names