More consistent space name. Using declare more consistently