mv dsl macros to reflect different api levels