Always use the same field name for locked version