[Issue #13] Changing device parameter to token, leaving alias for compatibility