#1023 | Use short name of concept