Fix type in protocol name and move protocol conformance to the implementation file