Cleaned up to allow https urls. Cleaned up naming to use correct terminology