[minor] renames/moves for andrzej