Default naming clean-up