Rename 'type fs' to 'type t'; rename 'make' to 'format'

Signed-off-by: David Scott <dave.scott@eu.citrix.com>