Some renaming, fixed a copy and paste mistake in the licensing.