BF: fix naming conflict and HOME path reference