Removed FIXME comment for a fixed issue
Added uniform prefixes to the functions