fix camelCase and avoiud re-wrapping $()