Use cap constructor names
Fix remaining JSHint warnings