Updated some block names