Fix assembly name
Fix markup