Renaming in progress, fixup for bug #41
Renaming in progress, fixup for bug #42
Libraries for hybrid language have proper names
Renaming for hybrid language completed