Added the ability to override Property and Parameter names.