Fix broken play when no adjacent pieces
Fix naming convention