Changed str to Name, so they can have annotations