back to UUID usage
naming change