Updated cyvmath, updated member naming convention