Fix Board name and clean up