Rename function to match the naming convention
Remove resolved FIXMEs.