REVIEW: Feature/rename gem