Add development requirements
Fix some minor naming issues