Blueprint names

Unfortunate accident. Reverted to using basename since if they are not
folders they shouldn't have a None string.