Semantic naming, minor styling fix to dash