WOBS-2922: Use name consistently