fibers, attempt 2

Gave each buildtype an explicit name instead of attemping to
deduce it from other params.