CFY-1185 use constants instead of strings