Some renaming, work on go book generation.