Add correct contant names..