Fixed callback functions aliases to conform with D2 standards.