Be more consistent over use of Property names and indexes.

Move some stuff out of propertyInfoIndex into the annotations - in particular the jname and dbname properties.