Rename Package[apache] to Package[httpd] and Service[apache] to Service[httpd] to match puppetlabs-apache