Fix blueprint spec

Also added constructor names for better debugging