Fixes for webkit and tidy up names