Minor renaming + data type fix