Cleanup of naming and AssemblyInfo