fixing names + whitespace
Merge branch 'f-fix' into dev