Wicked refactoring and renamed, plus configuration of NHibernate vane plus Save