Improve registry naming and exchange declarations