fixed some naming issues due to gem rename