FIx for gem name and file include