Use RemoteConstants instead of strings