Made sure all identifiers are of the same type

Signed-off-by: Lars Kiesow <lkiesow@uos.de>