clean up and renaming for ruby extension.