Changed name from 'generic-http-stub-server' to 'http-stub-server'
More refactoring work