Added missing files, fixed name