Additional name fixes
Merge branch 'code_styles' into point_offsets

Conflicts:
	jquery.flot.valuelabels.js