Changed naming of code to remove version numbering, corrected/amended
comments.