Removed the FIXME comment since it's not so important to change the
names of the methods.