update blocks name convention. Use ANHelper Functions