made the nomenclature for Lifecycle consisten on lifecycle.  Closes GH-117