Fixing to gyr.core namespace