Additional name fixes
Merge branch 'code_styles'

Conflicts:
	jquery.flot.valuelabels.js