better scaffold naming