renamed thread and block macros