Give more accurate name to AMD param.
Convert demos and tests to AMD.