Replaced hyphens with underscore for shells compatibility