Temporary hack to replace colon with __ for now