vsl: rename nvmd to s where appropriate