Fix naming and add gems