[+] rename constants (sorry)
[*] fixes