Unambiguous naming and additional metadata