#389 Update constants usage.