Tide up of class names, package names and plugin descriptor