change naming of constants and variables
push group into effective context even if null