Issue refs #1540: fix not renamed consts
Bug refs #1552: fixed