Lets fix this ugly import here and elsewhere.

First, this is not related to config - maybe constants?