[#905] CLean up import, capitalized constants